Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 20:07:15 +0000 (12:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 20:07:15 +0000 (12:07 -0800)

Trivial merge